Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 7 Sep 2010 22:29:08 +0000 (22:29 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 7 Sep 2010 22:29:08 +0000 (22:29 +0000)

Trivial merge